From 2c2092e7b87be65542393bb6dc19c8951fc26989 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sat, 2 May 2020 08:45:19 +0200 Subject: [PATCH] window: Don't care about shadow in measure() --- gtk/gtkwindow.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index e773ab41be..b5b8f90efc 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -630,18 +630,9 @@ gtk_window_measure (GtkWidget *widget, int title_nat_size = 0; int child_min_size = 0; int child_nat_size = 0; - GtkBorder window_border = { 0 }; - if (priv->decorated && !priv->fullscreen) { - get_shadow_width (window, &window_border); - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - for_size -= window_border.left + window_border.right; - else - for_size -= window_border.top + window_border.bottom; - if (priv->title_box != NULL && gtk_widget_get_visible (priv->title_box) && gtk_widget_get_child_visible (priv->title_box)) @@ -680,17 +671,13 @@ gtk_window_measure (GtkWidget *widget, if (orientation == GTK_ORIENTATION_HORIZONTAL) { - title_min_size += window_border.left + window_border.right; - title_nat_size += window_border.left + window_border.right; - child_min_size += window_border.left + window_border.right; - child_nat_size += window_border.left + window_border.right; *minimum = MAX (title_min_size, child_min_size); *natural = MAX (title_nat_size, child_nat_size); } else { - *minimum = title_min_size + child_min_size + window_border.top + window_border.bottom; - *natural = title_nat_size + child_nat_size + window_border.top + window_border.bottom; + *minimum = title_min_size + child_min_size; + *natural = title_nat_size + child_nat_size; } } -- 2.30.2